From 66180232be7e373424c16e20aa6936e8d49e79ae Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 18 Jul 2006 13:57:06 +0000 Subject: [PATCH] oooops. 2006-07-18 Kristian Rietveld * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_start_editing): oooops. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkcellrenderertext.c | 21 +++++++++++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52da5cc827..1a7a81988e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-18 Kristian Rietveld + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_start_editing): + oooops. + 2006-07-18 Kristian Rietveld Fix for #335012, reported by Matteo Nastasi. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 52da5cc827..1a7a81988e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-07-18 Kristian Rietveld + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_start_editing): + oooops. + 2006-07-18 Kristian Rietveld Fix for #335012, reported by Matteo Nastasi. diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 02a3f36581..f5998eb339 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1778,7 +1778,6 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell, GdkRectangle *cell_area, GtkCellRendererState flags) { - GtkBorder border; GtkRequisition requisition; GtkCellRendererText *celltext; GtkCellRendererTextPrivate *priv; @@ -1804,7 +1803,25 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell, gtk_widget_size_request (priv->entry, &requisition); if (requisition.height < cell_area->height) { - g_object_get (priv->entry, "inner-border", &border, NULL); + GtkBorder *style_border; + GtkBorder border; + + gtk_widget_style_get (priv->entry, + "inner-border", &style_border, + NULL); + + if (style_border) + { + border = *style_border; + g_boxed_free (GTK_TYPE_BORDER, style_border); + } + else + { + /* Since boxed style properties can't have default values ... */ + border.left = 2; + border.right = 2; + } + border.top = (cell_area->height - requisition.height) / 2; border.bottom = (cell_area->height - requisition.height) / 2; gtk_entry_set_inner_border (GTK_ENTRY (priv->entry), &border); -- 2.30.2